From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 3 Mar 2019 17:02:34 +0000 (+0200)
Subject: Fix starting temacs interactively
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~3884
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=db3b3b350658e31c2668f2a14072d6ada9e2ae7c;p=emacs.git

Fix starting temacs interactively

* src/dispnew.c (init_display_interactive): Don't call
init_faces_initial if we aren't initialized, since
tty-set-up-initial-frame-faces is not available then.  This
restores the ability to start "temacs -nw" and also avoids
bad crashes in "emacs -nw" if the pdumper file is not found.
(Bug#34707)
---

diff --git a/src/dispnew.c b/src/dispnew.c
index 9220213b907..7596528fed9 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6186,7 +6186,7 @@ init_display_interactive (void)
   calculate_costs (XFRAME (selected_frame));
 
   /* Set up faces of the initial terminal frame.  */
-  if (!noninteractive && NILP (Vinitial_window_system))
+  if (initialized && !noninteractive && NILP (Vinitial_window_system))
     init_faces_initial ();
 }